merge c and e server 2022